shortened some code