Vid 1936

Not critical but I think it would be nice to set some constants somewhere with these values for future use.