Further Dev Completed