added some TODO, changed comparison (==) for safety