added my own stuff