more oops
Working Properly now