FIXED some as before + rest files