Update

Added new function, restructured layout