Fixing issue and making things faster