More tweaking .. still not working right