reducing complexitiy a little...