add bunch of better syntax
add bunch of better syntax