better defaults added