Converted to Constants and added fixes