Made version with more features