Added new function, formatting issues