Fixed bugs - version tested with Livia