added roll overs, cleaned up code