Edited headers and finalizing this part