Merged and updated as of tuesday