Redesigned file according to Finn's suggestion