Re-adding latest code