updated for long