Final version tested with