Started on fixing bullets (In progress)