changed to appropriate data types