Changed the structure for easier pulling