Tested and clean

S