updated for homnick