merged with original code