more updating & refinement... but i'm not sure what...