changes
updated and cleaned