Bug Fix and moving scripts here