Major changes, again
trying to correct errors..