Edited Adding Manual Points and bugFix