got rid of id, small adjustments