Smarter check status, and function
Merge branch 'smarter-check_status' into develop