Simplifying minj's changes