Including functions for the lastest version