WORKING

improper formatting from merge removed