Trying to solve the problem
Final tweaks