added ideas to make better