Added cool new features