added some tweeks