Added changes...it still isn't quite right...