Transform + some corrections