Authentication done
fixed merges