added headers and removed un-needed methods