REplaced hardcoded values with constants