Added some math and an additional property