cleanup 3000
cleanup
cleanup
cleanup / rename
implementing adv-cache