Fixed up methods and finalized