More functions 

Please accept the last version , is almost complete