Updated methods to check before taking action