Modified file structure. Added quick select.