Added custom values
Removed unnecessary check