Some standalone functions added