updated with better commands