Merged with Daniel completed