Change data format 2

Added few function and change functionality