Design not final yet, and in fact I'm going to change it immediately,
but this is an standalone change for itself.