added more custom stuff