updated with mouseovers
should merge