added trivial stuff