some alterations... still not happy