make some love with the code. Now it works more smoothly