refactored properties
added support to subtract and parse