Added few unfinished functions