TODO updated with new ideas