Version 2

Status fixes