Made cosmetic changes
Added a warning
Fixed the order of the arguments