updated hopefully okay..