Changed formatting and added patch