FIXED!!
Merged from last branch. And updated. And fixed?