Resolved errors/adapted merged code