add
add enable disable functions
improve style