Still not working. Making a few more changes