Now working. Making everything smooth