deleted shit and cleaned a bit for sharing with jordi