a little restructing and renaming