finalised everything