Merged all da changes!!