major changes that seeem to work