Updated fucntionality