Moved as promised. Also fixed