Reduced a lot the usage of local javascript