updated version after cleanup