More minor changes, just a maybe of how to implement