Implemented recent changes.