Fixed ALL the issues!