Fixed all issues!