Initial commit after merging original changes