Last couple of changes before development