1st draft
renamed key in SL
mass refactoring