same comment as above, code duplication?