cleaner added. test needs to be completed