Improve functions
 Improve functions