Trying to change the default call and make it a bit more smart