hopefully dont break anything
merged some changes, committing again