Added more helpful functions