updated commands, new templates