TODO: Few things left to fix