Updated - Removed constants