Updated image functions