Finished for 1st relase