changed somes names and moved some mecanics to make it more meaningfull.