Still doensn't work. Made more changes