Changed Programme, some performance improvements.