Merged with my updates