Improved by creating 2 properties