cleaned up, rest of the dots