Extra functionalities + finishing touches