Changes for 8CS and Bug fix #4