Update cuztom
Improvements