Adding all changes from 4/19