merge with cristian branch