Updated a bit to make it prettier