added onTop drawing back in