Do that properly later