added everything so that it is nice