TODO updated
removing warnings