Changed the order a little