updated to version
cleaned up