Should be more clean