[UPDATE] More tweeks