working again but with bugs