code okie after clean up