Its working again, doing some debugging
Merged changes with master