refactored to use pixels
2.0.0