Yes we should do that .. later