added everything up till now