Changes made

Now everything works correctly