cleaned up
updated version