Updated + bug solving