Adding in some tweeks