Made things work smoother