Fixed range and stuff
merge