added more code/features