Updated to remove implicit type conversions