Updated to most recent development files