Updated, more features added