refactored properties for speed purposes