almost working id
refactored some variable names