changed findById to findOne