moved and fixed data