updated for better