committing w eric changes :)