Oppe BUG FIXING, still need to work on it