#29 shortened some methods