Work update on alpha (info in next commit