Testing everything. Fixing