merging alex's changes