merged my new updates