adamizations

optimized!