commitiing to start new branch and solve marker issue and other stuff