initial commit
efficiency improvements