Fix some issue and improve with new functions