all current stuff added